minhnguyen - Modify DAO