Fix schema generation to allow propre types in front (#2404)