After cmake and const-nonconst new API refactor