Fixed API design