Improved fields lookup and type control