Added in some annotation implementation and user support