Range and Context added