Add mask to the fields #7