Changes of ServerSide logic