Added some more currying