Updated model defintions, bubble-up updates