Added more JSON deserialise logic