Modified structure and imported new code