* Fix scope of extension methods