Added partial support for unique ids+