Added object id support using numeric keys