Completed json classes