Added changes for multiproject, discussed at review