Add forward support