Update: use classes constants