Add some modification about Service layer and DAO layer