Added few more changes to the files