Adding manage baseline functionality