Lot of improvements & replace Sessions with Contexts
Update version