Interface libraries reworks