Dynamic port (clean commit)