Service configuration update

For #209 and #210.