Re-add standalone support