Rework on interface