Fixed JSON mapping