Few security related services refactored