Removed dependency on eshop module