Server side logic added