Updated for API design