Implemented context awareness