Added parser setup