Change Vector class and main application