Feature/context notation