Updated class loader, updates to spider and cat