[BUG #8471] Removed class registry and undefine
[BUG #8471] Moved JSON marshaler to bootstrap