Adding parser support