Commands refactor
Configuration refactor
Database refactor