Sonia - Added address as separate fields, er diagram, and corrected miror issues