Moved HPVAN back to a metaclass