Updates to base code