[IMPL] Converted to class