added additional parser features