DB - Little refactor