small update for commons-core refactor