API-style improved