Second set of commit for epg/contract. There are some feedback/bug fix which will happen in next commit