DCAEGEN2-Refactor CLM project block