Add backwards compatibility