Improve service layer