Context analysis added