Added workspace check to simple D&D targets