Modified user database structure