Updated core short codes