Fixed core class