Added baker session support.