add context awareness