(+) top-down scenario implemented; (+) DB storage; (~) Overall improvements