Extend the main schema based on @Rizziepit’s feedback