Add decorators and per Host connections