To be changed after the server migration