Removed Underscore and Added Maps