JSON marshalling support added