Reducing dependencies - gal in core classes