Don't trigger CMTask before trees are built
Code Polishing