Added SID and CID in both front end and back end