Breaking Patient & Dependent in recommended solution