Parser functionality added