Use separated types for host and port to use

Instead of Composite which is a source of problems

(cherry picked from commit dcca29165af2e038d44005bf69db09a000b0b49c)