Removed manual ID assignment