[Shop] Interafces + Implemenation Fixed