Added some more instantiation code to the system