Minor revisions

Removed optional parameter fields. Add phone type enum