Move custom commands to separate file