Update to support multiple persistence units