Improving server side and moving around functionalities