CR changes: cached headers values, moved hardcoded values to variables