Added a new tool class for masks