Beefing up cmake file