Improve performance
Add mixins

[Delivers #78995332]