Make default interface safer