WIP auto-detection