Refactoring
Add return key support