Changes structure and added override variables.