Implemented a proper vector container