Added new target types system