Added executor getter.
Fixed the data structure.