Add work specific stuff
Fix cmake functions