Changed ill-conceived extension methods to "normal" methods