Modified axis to be more server oriented