* Core System refactored