Fixed eager loading singleton