Add keys support