Add model validations and clean up admin hierarchy