Moved extensions to Core.Extensions