Additional updates to the base code