Added logback configuration and some code changes