Improve Tadpole editor compatible