Add more handling for multi projects on a server