Add Session to handler callbacks, add onMaybeMove logic