refactoring to support forms (services) without additional fields