Major changes
Add service, resolve unit test, change repository