Added logic to drop properties with null value