CAL-414: Using function from COMMONS