Updated orm.c