Modified the id and the constructors