Fewer things are hardcoded now