Added check for property