Introduce Configuration objects, see #3673