methods of static class changed to extension methods