Change for backwards compatibility