Added curry and uncurry