Moved SVAA to a subclass