Additional work on target types