Pseudo sub indicators

Add support for pseudo sub indicators in the data