Changed class data from methods to datacore