Added extensions
Modified user model