Added basic parser features