--configuration and refactor changes