Add unique get support