Modified to add workaround for all autoloads