enhancements to make it run on as7 with persistence