Some API changes and additional DNS config