Updated core for opensourcing