Support standalone mode