Used enum contants instead of strings