[TASK] Remove unused class alias
[BUGFIX] Add more condition for field type int