Added keys
Fixed bug in keys.