Interface is a bit improved