Updated hardcoded list