Updated ListBase component