Fix attaches & update Shop module