Added more utility