Some refactoring
Working with DB