Add stuff for building CM