Rework Author and Plugin commands