make ThirdParty entity mapping optional