Added new files and updated the utility