Added OT classes, fixed XCode compile issue