Added filtering and global queue