adding contexts in specs + small changes on interface