Added id field for units