Formatted for pep8 added a new field types