Modifying some fields to suit implementation