Modified the Service layer to make the application simple