Updated DAO to include server push and find by users between