Improved the core Class