Improving context with object id