Fixed and updated service changes