Continue working on the new Sites feature