Add support for custom cluster name and other improvements