Changes to accomodate plugin system