Make context optional