Modified System to use a universal baseurl config