Add structure, add turnon/turnoff factors