DAR-2626, add additional mixins
DAR-2626, use mixins instead of hardcoded properties