Rework Entry

Component-wise Rework