Optimization and design

[#48647481]