updated id creation logic, idProperty is now going to be always there