Added parser support for #256