Updates to base.json handling