Fix for ID generation

Use number type instead of string for ID generation