Revert "Form as entity"
Merge pull request #2 from andytruong/revert-1-pr/form-entity

Revert "Form as entity"