Added support for 2012 extension