Incorporate Format into factory