Enhancement: avoid hard-coding