Refactoring of Service and Data Access layers for fserver-ui