Improve conditional projects