changes for new framework version 2.1