metrics added for both prod and demo mode
rename schema type objects for clarity