Add shortcde assertions