UPDATE: Fix issue with autoloading