Add peak support