AdminModel refactored and cleared