Updated core - removed messages for now