Change API to store also pointer and structs into Vector