Added more def's to Parser