Added few changes. Need to update code to make it compile