Make tile choices more easily expandable