Updated Keys

-Updated Keys
-Added map