Mask refactor with optional fields
Update README