Improved the advanced property pass to avoid a crash and generate more properties