Add ID and fixed name