include map, vector. add getters/setters