Server now only timesout if a timeout period is Set
Fix circular references