Adding Mitzell vectors support
Conflicts resolved