Database added, fixed repository and service class