moved extension methods to appropriate class