Added some class methods and admin changes