Adding session spec, some session parsing