Add in context feature which got lost.