Maintain backwards compatibility