Improved producer function calls structure + errors