Added AfterStep annotation and wired it into Runtime