Update to include Zend\Form\Annotation and entity properties