Added more interface components