Feature enhanced and refactoring.