Preserve backwards compatibility