Adding support for subsonic context