structural updates for a better workflow