Make interface clearer