Modify DAO and Commands + e2e