WIP: Include more variants