[TASK] Add proper constraints