For backward-compatibility with older components