Made functionality for adding C&I its own class