Add envelope, switch get/set to new style