Minor improvment on interface