Make JoinKeys
related changes due to refactor
#160
Merged
JoinKeys
related changes due to refactor
#160