Allowing timeouts from services

We want to be able to allow timeout settings in the public interface.