Created some Common files and updated Parser