Added more custom product support