Added facilities for deferral etc.