Modify some methods to adapt with new create/edit forms