Improve loading state and add to product