added all optional field to orphan form model

part of PT story https://www.pivotaltracker.com/story/show/76239618