Update: organise default setting