Doctrine Edited.

Some work around the validation, completed.