Minor CoreBaseClass update