Redid the structure based on updated plugin.