Small refactoring and added admin attribute