Added DAO's, Reasources, Tests