Removed 'type' from model fields