Fixed previous commit, added setting default values to fields