More interface improvements