Updates to service configuration and added logging