Accomodate new runtime system