Adding some short code support.