Added "id" field to various properties