Fix for masker, add factory for masker