Added standalone build