Services - fix code base