Path updates, export and func additions