improve mashery orm trait