Added oid support; Updated documentation