Small interface improvement