Better API definitions