Added some fields, improved performance.