Add runtime annotation runner. Minor modifications.