Changes for D7 API