Add collections type complete, constructor \w set/getters