Use catalogues for better soc
Fixed issed with multiple files