Moved some interfaces out of the offered premade contracts.