Solution file related changes