- changes to prototype handling and generation