Updates to facilitate testing