Enhance Core class and others