Modifications to context awareness