Added Metric and MetricConfiguration Screens + User and MetricRoleType Table to Model