Fixed an issue with structure vs json class hierarchy