Serverside changes

Signed-off-by: arege <bigdataplayers@gmail>