Added custom fields and shortcodes