Added generated keys support