Updated for multi project build