Preparing for integration with CLOC