Update for compatibility with free list