Add Executor and remove executeXxx variations from database