Added some structure and a script reference