Added service, tests and dependencies