Fixing form/model inheritance issue