Added Dao For All Sub Classes, Updated Services Accordingly