Lot of fixes and addition of more stub services