** Added support for parsing select fields