Additional methods, plus fixed namespace case