Reworked interface a bit