update
flatten faucet type hierarchy, in preparation for reflecting water faucet