Finishing up the implementation of Product Forms