Starteed implementing other sessions and few minor changes