Moved type to JSON