Code improvements + new Context object