Updating Extension to use newer skeleton