RAZ-2224: Updated case to include "x" types