Added UM* and define * in terms of it.
Reformatted the Target structure.