Fixed auto loading for containers