Changed from hardcoded strings on json properties