Make compatibile with spree