Services saving methods refactored
Some links added