Response syntax improvements - fixes #21