Add id fields and accessors