Smaller functions to ease new services