Add code to serving functions