Changed to internal JSON parser