Added enum (code more readable)