finish support for id fields