improved xorm usage