Added universal ID compatibility