Add an option to build cs as well