Added services.

Username and password now optional.