Add Self-contained mode