Thank you! I'll change scheme to valid one (haven't even thought about it). Looks that better migration path is to write some own-maintained wrappers.