Changed methods to make the first parameter clearer to the consumer. Updated for Xcode6Beta3 changes to swift