Added better event blocks support