Removed some overloaded methods, simplified method names