update configuration keys
refactoring
add browsing capabilities