Added timing blocks support