Improved annotation for object types.