sessionSupport over loading / code cleanup