Adding of configuration management (properties file) and some code improvements