core_ext improvements