buildKey added
refactor