Now compatible with new ids