Add two more utility packages