Add usage comments for more functions and roles