Added multi-project awareness