Updated autoloading for SSP