Added general structure