Added structure from ModExtra