Add support for erasure, vectors