runtime updates & generator enhancements