Some redesign regarding the system interface