For backwards-compatibility with older components