Empty Solution Setup changes