Better support for storing the tax as foreign key