Several interface improvements