Switched from typetuple to enum