add standalone support