Prepare for custom commands