Updated var context to self