Added few files and updated existing code