Added more VCs and new classes