Layer modification

Suppress business logic dependence.