Adding filtering and connections