Added dao methods and model classes