[fix] transform other data definitions to define