improve DAO save