Added more to the core