Adding more DAO and tracking