Remove extra abstraction. jsut return publicAPI