Updated component format