added timeouts and data source to attachment folders