Refactored CommonService urls and constants