move annotations to fields