Extra support for the cl package structures - View it on GitHub