Fixed CommonService constants