Commands correction + DAO review