Added wants support