Further work on the Etsy module.