Refactoring - Removed vector class dependencies