[WIP] Interface change

Don't merge as it is not done yet.