Legacy use-case support