Removed deprecated methods usage
Components decoupling