Making the framework a little more "enterprise" ready.