Removed unnecessary fields and reordered the used fields