Improve extsd fix + missing props