Added keys support