more classes to core project