Added new fields
Code cleanup