Integration of ReduxFramework - 2nd pass