Fixed all the components to support the proposed architecture