Improved the selection of fields and more fields added