Started adding support for rendering shortcuts