More dev on Interface rework