Added Creation and server_id handling