Updating server initial code base [WIP]