configurationLocation and other rework