Add basic server side parsing and optimise local parsing.