Improving API with ?