Refactor CSTL dependencies + create business interfaces
Fix for merge changes