Add constant codes, refactor executor