Use separated types for host and port to use

Instead of Composite which is a source of problems