Fixed version for Demo which contains new services
Added some improvements