Pushed new version with independant CommentSpaceAllocator