- Further development on CPK restructure