Use extra key constants instead of literals