Alignment to current API