JSON marshalling support added and marshalling configuration refactoring