Refactor; Add new properties