And all interfaces that should have been in the last commit (74f8ab9).

Signed-off-by: Daniel Josefsson <dannejosefsson@gmail.com>