Add checking for server methods