Add bodyType annotations add some enums. Change packeges