Refactored for more intuitive naming
Updated to more intuitive API