Updated JSON serialiser with missing elements