Updated to the new custom.json structure