Improved interfaces, removed unnecessary methods, added new ones.