Move more vars to context object