Improve support for large entries