improved module orm