Add support for varying port number
Playlist DSL tweaks