Modified for new Core Services package structure.