Adding more functions to the generic API