Calderon’s office says it is working on further amendments, including exemptions for public schools and the agricultural sector.