Applied new changes of Jaws_ORM