Get rid of JSONPayload in favor of JSONModel