Updated Object annotations for consistency

Updated Object annotations for consistency. Close issue #26.