Updated whole framework structure/interface.