Updated to work with Anvil format.