Changed a few methods to extension methods