Simplify server side code