Made some fixes so we can use string as ID aslo