Improve DI Approver and PropertyType composition. Remove TypeTags because of #SI-6240