Identified more variables as type choices