integration of amsterdam changes for v 6.0