Design for usage optimization

Completed