Added CommonSvc for demo