Modification to the core. Ready for a Beta version