Minor CoreBaseClass Update