Fixing Service FCNS

Fixed Service Functions