Adding context and api for it