Adding Tomas Domingo store fixes