Renovating the interface, several files needed to be updated in one
commit.