Refactoring; Added properties