update the properties to use annotations