Begin to add custom parser capability