make API conform with new API