Updated Unmask class