Feature/2.4 mock components with config