#1 Fix core classes