Expanded return buffer to allow for larger entity names