Updated Logic Component to the new architecture