Add checks for spout