Extracted generateKey function as method
Removed unnecessary parameters from KeyHandler
Added refresh handler
Prepared CreateHandler
Merged master fixed conflict.