Refactoring

role in database ok