Singularize the Struct type and modify singularize to cover more cases