Added physical_only attribute