Absent property added, minor refactoring