Updates for 2014.2 Support