Reworked interfaces