Reenabled prepare_executor in parts