Fixed JSON and keys