[Core][Design] Enhancement of the design of solutions
[Core][Design] Enhancement again.