Changed component format