Added hook for backwards-compatibility