Updated service layer to be more generic - relabeled layers.