Refactor some commmand
Add DAO classes
Dao