Added Service & Dao layer