Migrated on new api structure