Added new parser features