diff --git a/app/models/job.coffee b/app/models/job.coffee
index ca252075..fac0cb7a 100644
--- a/app/models/job.coffee
+++ b/app/models/job.coffee
@@ -5,6 +5,7 @@
 `import Model from 'travis/models/model'`
 `import Log from 'travis/models/log'`
 `import DurationCalculations from 'travis/utils/duration-calculations'`
+`import languageConfigKeys from 'travis/utils/keys-map';`
 
 Job = Model.extend DurationCalculations,
   logId:          DS.attr()
diff --git a/app/utils/keys-map.coffee b/app/utils/keys-map.coffee
index 1de98cdc..88f06268 100644
--- a/app/utils/keys-map.coffee
+++ b/app/utils/keys-map.coffee
@@ -1,21 +1,11 @@
-configKeysMap = {
+languageConfigKeys = {
   go:          'Go'
-  rvm:         'Ruby'
-  gemfile:     'Gemfile'
-  env:         'ENV'
-  jdk:         'JDK'
-  otp_release: 'OTP Release'
   php:         'PHP'
   node_js:     'Node.js'
   perl:        'Perl'
   python:      'Python'
   scala:       'Scala'
-  compiler:    'Compiler'
-  ghc:         'GHC'
-  os:          'OS'
   ruby:        'Ruby'
-  xcode_sdk:   'Xcode SDK'
-  xcode_scheme:'Xcode Scheme'
   d:           'D'
   julia:       'Julia'
   csharp:      'C#'
@@ -24,4 +14,20 @@ configKeysMap = {
   elixir:      'Elixir'
 }
 
+configKeys = {
+  env:         'ENV'
+  rvm:         'Ruby'
+  gemfile:     'Gemfile'
+  jdk:         'JDK'
+  otp_release: 'OTP Release'
+  xcode_sdk:   'Xcode SDK'
+  xcode_scheme:'Xcode Scheme'
+  compiler:    'Compiler'
+  ghc:         'GHC'
+  os:          'OS'
+}
+
+configKeysMap = Ember.merge configKeys, languageConfigKeys
+
 `export default configKeysMap`
+`export { languageConfigKeys, configKeys }`