small modifications on ORM bundle