Removed dependency on extension methods