Added server overrides
