config changes to make references more generic