Changes for scape-tck