Upgrading to work with 2.1 Core.