Added SimPropRegistry and Annotation improvements