Refine parsing, add session actions.