Make interface definition consistent