Update functions to allow for easier sourcing