adapted new delayed-loading API