Define WANT_NEW_API