Pass context around

Change-Id: If95812168472e760b7bde8a1b58a53d37ec5bc38