Switch to sets for easier filtering