Initial commit for core overriding