Switched many methods to extension methods