Updated to new session model
Added back submods