Changed the id construction