Minor change of interface