Bring in line with other plugins