Updated server file
Updated request handlers