Feature/new core