Added support for session-level conf overlay