Comply with new API interface