Moved entry dictionary to object.