Add fixed vectors, and proper linking of traits