Some Core\Abstraction improvements.