WIP: Continuing work on PB::Model::Generator