Updated fake service