Ensure that we don't break backwards compatibility