Update API to be a real category instead of a class method