Support for legacy function