Added patched portal-impl