Added more cmake integration