Added target and terminal support in Dashboard