Muraorm work

Some mods to ORM