adding handling db users

+ refactoring singleton uses