* Resolved problems with too restrictive data type

* Apply suggestions from code review

Code review remarks introduced
Co-Authored-By: Tomasz Socha <tomasz.socha@intel.com>

* Code review remarks. Part.2
Co-authored-by: Tomasz Socha <tomasz.socha@intel.com>
Co-authored-by: Adam Rogowiec <adam.osewski@intel.com>
Co-authored-by: Sang Ik Lee <sang.ik.lee@intel.com>