Replaced string lookups with key lookups (#39)