Add two fields to form type and entity