Added missing setter & refactoring.