Less hard-coding