Add checks to ensure no duplicate ID's