MFI-33 Location now complextype instead of simple string