Require also masks

All this handling will have to change upon merging with opencv,
so no use in handling no masks now