Added persistentce layer to the Server