Add i piping support