Incomplete refactoring - must finish IJob and ITrigger