Allow mask overriding on entities