Moved the symbol annotation properties, and added similar datatype properties.