Add support for Jakarta relocation