Refactoring to avoid after create hook.
Refactor API, so each method has a single task.