Improvements, refactor, config create support, more test cases