Better backwards compatibility