Refactored framework to use vector class