more changes to support YEI and hillcrest, need dynamic configuration now