Added the service and dao layers