updated Oversized Entries Support