Improved MaskList implementation to work with independent masks too