Codechanges and additions inside class.database and class.admin. Be carefull!