*Format: Changed from enum to class