Updated supports to match README and testing