Added freestanding flag