diff --git a/app/assets/javascripts/controllers/admin/rentals.coffee.erb b/app/assets/javascripts/controllers/admin/rentals.coffee.erb
index 69b2c290..372cd380 100644
--- a/app/assets/javascripts/controllers/admin/rentals.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/rentals.coffee.erb
@@ -93,7 +93,7 @@ Application.Controllers.controller 'NewRentalController', ['$scope', '$uibModal'
   ##
   # Open a modal dialog allowing the admin to create a new partner user
   ##
-  $scope.openPartnerNewModal = (subscription)->
+  $scope.openPartnerNewModal = (rental_subscription)->
     modalInstance = $uibModal.open
       animation: true,
       templateUrl: '<%= asset_path "shared/_partner_new_modal.html" %>'
diff --git a/app/assets/javascripts/controllers/rentals.coffee.erb b/app/assets/javascripts/controllers/rentals.coffee.erb
index c5ca5dd6..582c336e 100644
--- a/app/assets/javascripts/controllers/rentals.coffee.erb
+++ b/app/assets/javascripts/controllers/rentals.coffee.erb
@@ -75,7 +75,7 @@ class RentalSpacesController
 ##
 # Controller used in the public listing page, allowing everyone to see the list of spaces
 ##
-Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state', 'spacesPromise', '$uibModal', '_t', 'Wallet', 'helpers', ($scope, $state, spacesPromise, $uibModal, _t, Wallet, helpers) ->
+Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state', 'rentalsPricesPromise', 'rentalsPromise', 'spacesPromise', '$uibModal', '_t', 'CSRF', 'Wallet', 'helpers', ($scope, $state, rentalsPricesPromise, rentalsPromise, spacesPromise, $uibModal, _t, CSRF, Wallet, helpers) ->
 
   ## Retrieve the list of spaces
   $scope.spaces = spacesPromise
@@ -113,20 +113,65 @@ Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state'
   
   $scope.coupon =
     applied: null
-
+ 
+  $scope.rentalsPrices = rentalsPricesPromise
+  $scope.rentals = rentalsPromise
   $scope.selectedRental = null
 
-  $scope.selectRental = (rental) ->
+
+  $scope.selectRental = (space) ->
     if $scope.isAuthenticated()
-      if $scope.selectedRental != rental
-        $scope.selectedRental = rental
-        $scope.selectedRental.amount = 10 ## temporal
+      if $scope.selectedRental != space
+        $scope.selectedRental = space       
+        price = findPriceBy($scope.rentalsPrices, $scope.selectedRental.id,  $scope.ctrl.member.group_id)
+        rental = findRentalBy($scope.rentals, $scope.selectedRental.id,  $scope.ctrl.member.group_id)
+        rental = (rental) ? rental : createRentalPlan(space, price)
+        $scope.selectedRental.amount = price.amount
+        $scope.selectedRental.rental = rental
         updateCartPrice()
       else
         $scope.selectedRental = null
     else
       $scope.login()
 
+
+
+  createRentalPlan = (space, price)->
+    ## form inputs bindings
+    $scope.rental =
+      type: null
+      group_id: price.group_id
+      interval: "month"
+      intervalCount: 1
+      amount: price.amount
+      is_rolling: false
+      partnerId: null
+      partnerContact: null
+      ui_weight: 0
+    CSRF.setMetaTags()  
+    url= "/api/plans/"
+    $.post url, (response)->
+      console.log("saved")
+      return response.id
+  
+    ##
+  # Retrieve a rental from rentals array by a spaceId and a groupId
+  ##
+  findRentalBy = (rentals, spaceId, groupId)->
+    for rental in rentals
+      if rental.space_id == spaceId and rental.group_id == groupId
+        return rental  
+  
+
+  ##
+  # Retrieve a price from prices array by a spaceId and a groupId
+  ##
+  findPriceBy = (prices, spaceId, groupId)->
+    for price in prices
+      if price.priceable_id == spaceId and price.group_id == groupId
+        return price
+  
+
   ##
   # Callback to trigger the payment process of the subscription
   ##
@@ -169,11 +214,12 @@ Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state'
         selectedRental: -> $scope.selectedRental
         member: -> $scope.ctrl.member
         price: -> $scope.cart.total
+        rental: -> $scope.selectedRental.rental
         wallet: ->
           Wallet.getWalletByUser({user_id: $scope.ctrl.member.id}).$promise
         coupon: -> $scope.coupon.applied
-      controller: ['$scope', '$uibModalInstance', '$state', 'selectedRental', 'member', 'price', 'Subscription', 'CustomAsset', 'wallet', 'helpers', '$filter', 'coupon',
-      ($scope, $uibModalInstance, $state, selectedRental, member, price, Subscription, CustomAsset, wallet, helpers, $filter, coupon) ->
+      controller: ['$scope', '$uibModalInstance', '$state', 'selectedRental', 'member', 'price', 'RentalSubscription', 'rental', 'CustomAsset', 'wallet', 'helpers', '$filter', 'coupon',
+      ($scope, $uibModalInstance, $state, selectedRental, member, price, RentalSubscription, rental, CustomAsset, wallet, helpers, $filter, coupon) ->
         # User's wallet amount
         $scope.walletAmount = wallet.amount
 
@@ -185,7 +231,9 @@ Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state'
 
         # Used in wallet info template to interpolate some translations
         $scope.numberFilter = $filter('number')
+        $scope.member = member
 
+        $scope.rental = rental
         # retrieve the CGV
         CustomAsset.get {name: 'cgv-file'}, (cgv) ->
           $scope.cgv = cgv.custom_asset
@@ -200,10 +248,10 @@ Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state'
             growl.error(response.error.message)
           else
             $scope.attempting = true
-            Subscription.save
+            RentalSubscription.save
               coupon_code: (coupon.code if coupon)
-              subscription:
-                plan_id: selectedRental.id
+              rental_subscription:
+                rental_id: rental.id
                 user_id: member.id
                 card_token: response.id
             , (data, status) -> # success
@@ -213,15 +261,13 @@ Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state'
               $scope.alerts.push({msg: _t('an_error_occured_during_the_payment_process_please_try_again_later'), type: 'danger' })
               $scope.attempting = false
       ]
-    .result['finally'](null).then (subscription)->
+    .result['finally'](null).then (rental_subscription)->
       $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedRental)
       Auth._currentUser.subscribed_plan = angular.copy($scope.selectedRental)
       $scope.paid.plan = angular.copy($scope.selectedRental)
       $scope.selectedRental = null
       $scope.coupon.applied = null
 
-
-
   ##
   # Open a modal window which trigger the local payment process
   ##
@@ -233,11 +279,12 @@ Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state'
         selectedRental: -> $scope.selectedRental
         member: -> $scope.ctrl.member
         price: -> $scope.cart.total
+        rental: -> $scope.selectedRental.rental
         wallet: ->
           Wallet.getWalletByUser({user_id: $scope.ctrl.member.id}).$promise
         coupon: -> $scope.coupon.applied
-      controller: ['$scope', '$uibModalInstance', '$state', 'selectedRental', 'member', 'price', 'Subscription', 'wallet', 'helpers', '$filter', 'coupon',
-      ($scope, $uibModalInstance, $state, selectedRental, member, price, Subscription, wallet, helpers, $filter, coupon) ->
+      controller: ['$scope', '$uibModalInstance', '$state', 'selectedRental', 'member', 'price', 'RentalSubscription', 'rental', 'wallet', 'helpers', '$filter', 'coupon',
+      ($scope, $uibModalInstance, $state, selectedRental, member, price, RentalSubscription, rental, wallet, helpers, $filter, coupon) ->
         # user wallet amount
         $scope.walletAmount = wallet.amount
 
@@ -251,11 +298,14 @@ Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state'
         $scope.numberFilter = $filter('number')
 
         # The plan that the user is about to subscribe
-        $scope.plan = selectedRental
+        $scope.selectedRental = selectedRental
 
         # The member who is subscribing a plan
         $scope.member = member
 
+        $scope.rental = rental
+
+
         # Button label
         if $scope.amount > 0
           $scope.validButtonName = _t('confirm_payment_of_html', {ROLE:$scope.currentUser.role, AMOUNT:$filter('currency')($scope.amount)}, "messageformat")
@@ -271,10 +321,10 @@ Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state'
         ##
         $scope.ok = ->
           $scope.attempting = true
-          Subscription.save
+          RentalSubscription.save
             coupon_code: (coupon.code if coupon)
-            subscription:
-              plan_id: selectedRental.id
+            rental_subscription:
+              rental_id: rental.id
               user_id: member.id
           , (data, status) -> # success
             $uibModalInstance.close(data)
@@ -307,7 +357,7 @@ Application.Controllers.controller 'RentalSpacesController', ['$scope', '$state'
     if $scope.currentUser
       if $scope.currentUser.role isnt 'admin'
         $scope.ctrl.member = $scope.currentUser
-        ##$scope.paid.plan = $scope.currentUser.subscribed_plan
+        ##  $scope.paid.plan = $scope.currentUser.subscribed_plan
         ##$scope.group.id = $scope.currentUser.group_id
 
     $scope.$on 'devise:new-session', (event, user)->
diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb
index 8d577233..2e3880e6 100644
--- a/app/assets/javascripts/router.coffee.erb
+++ b/app/assets/javascripts/router.coffee.erb
@@ -514,6 +514,12 @@ angular.module('application.router', ['ui.router']).
           spacesPromise: ['Space', (Space)->
             Space.query({is_rental: true}).$promise
           ]
+          rentalsPricesPromise: ['Price', (Price)->
+            Price.query(priceable_type: 'Space', plan_id: 'null').$promise
+          ]
+          rentalsPromise: ['Rental', (Rental)->
+            Rental.query().$promise
+          ]
           translations: [ 'Translations', (Translations) ->
             Translations.query(['app.public.rentals_list', 'app.shared.member_select', 'app.shared.stripe', 'app.shared.wallet', 'app.shared.coupon_input', 'app.shared.cart']).$promise
           ]
@@ -570,8 +576,8 @@ angular.module('application.router', ['ui.router']).
           availabilitySpacesPromise: ['Availability', '$stateParams', (Availability, $stateParams)->
             Availability.spaces({spaceId: $stateParams.id}).$promise
           ]
-          plansPromise: ['Plan', (Plan)->
-            Plan.query().$promise
+          rentalsPromise: ['Rental', (Rental)->
+            Rental.query().$promise
           ]
           groupsPromise: ['Group', (Group)->
             Group.query().$promise
diff --git a/app/assets/javascripts/services/rental_subscription.coffee b/app/assets/javascripts/services/rental_subscription.coffee
new file mode 100644
index 00000000..bb87bff8
--- /dev/null
+++ b/app/assets/javascripts/services/rental_subscription.coffee
@@ -0,0 +1,11 @@
+'use strict'
+
+Application.Services.factory 'RentalSubscription', ["$resource", ($resource)->
+  $resource "/api/rental_subscriptions/:id",
+    {id: "@id"},
+    update:
+      method: 'PUT'
+    cancel:
+      method: 'PUT'
+      url: '/api/rental_subscriptions/:id/cancel'
+]
diff --git a/app/assets/templates/rentals/payment_modal.html.erb b/app/assets/templates/rentals/payment_modal.html.erb
index 97e831e6..d09582a8 100644
--- a/app/assets/templates/rentals/payment_modal.html.erb
+++ b/app/assets/templates/rentals/payment_modal.html.erb
@@ -1,13 +1,13 @@
 <div class="modal-header">
   <img ng-src="{{logoBlack.custom_asset_file_attributes.attachment_url}}" alt="{{logo.custom_asset_file_attributes.attachment}}" class="modal-logo"/>
-  <h1 translate>{{ 'rental_confirmation' }}</h1>
+  <h1 translate>{{ 'rentals_list.rental_confirmation' }}</h1>
 </div>
 <div class="modal-body">
   <uib-alert ng-repeat="alert in alerts" type="{{alert.type}}" close="closeAlert($index)">{{alert.msg}}</uib-alert>
   <ng-include src="'<%= asset_path 'shared/_wallet_amount_info.html' %>'"></ng-include>
 
-  <p>{{ 'here_is_the_NAME_rental_summary' | translate:{NAME:member.name} }}</p>
-  <p>{{ selectedRental.name }}</p>
+  <p>{{ 'rentals_list.here_is_the_NAME_rental_summary' | translate:{NAME:member.name} }} </p>
+  <p>{{ plan.name }}</p>
 </div>
 <div class="modal-footer">
   <button class="btn btn-info" ng-click="ok()" ng-disabled="attempting" ng-bind-html="validButtonName"></button>
diff --git a/app/controllers/api/rental_subscriptions_controller.rb b/app/controllers/api/rental_subscriptions_controller.rb
new file mode 100644
index 00000000..b60d439c
--- /dev/null
+++ b/app/controllers/api/rental_subscriptions_controller.rb
@@ -0,0 +1,81 @@
+class API::RentalSubscriptionsController < ApplicationController
+	 include FablabConfiguration
+
+  before_action :set_rental_subscription, only: [:show, :edit, :update, :cancel, :destroy]
+  before_action :authenticate_user!
+
+  def show
+    authorize @subscription
+  end
+
+  def create
+    if fablab_plans_deactivated?
+      head 403
+    else
+      if current_user.is_admin?
+        @subscription = RentalSubscription.find_or_initialize_by(user_id: rental_subscription_params[:user_id])
+        @subscription.attributes = rental_subscription_params
+        is_subscribe = @subscription.save_with_local_payment(true, coupon_params[:coupon_code])
+      else
+        @subscription = RentalSubscription.find_or_initialize_by(user_id: current_user.id)
+        @subscription.attributes = rental_subscription_params
+        is_subscribe = @subscription.save_with_payment(true, coupon_params[:coupon_code])
+      end
+      if is_subscribe
+        render :show, status: :created, location: @subscription
+      else
+        render json: @subscription.errors, status: :unprocessable_entity
+      end
+    end
+  end
+
+  def update
+    authorize @subscription
+
+    free_days = params[:rental_subscription][:free] == true
+
+    if @subscription.extend_expired_date(rental_subscription_update_params[:expired_at], free_days)
+      ex_expired_at = @subscription.previous_changes[:expired_at].first
+      @subscription.user.generate_admin_invoice(free_days, ex_expired_at)
+      render status: :ok
+    else
+      render status: :unprocessable_entity
+    end
+  end
+
+  def cancel
+
+    @subscription.cancel
+    
+    render :show, status: :ok, location: @subscription
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_rental_subscription
+      @subscription = Subscription.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def rental_subscription_params
+      params.require(:rental_subscription).permit(:rental_id, :user_id, :card_token)
+    end
+
+    def coupon_params
+      params.permit(:coupon_code)
+    end
+
+    def rental_subscription_update_params
+      params.require(:rental_subscription).permit(:expired_at)
+    end
+
+    # TODO refactor subscriptions logic and move this in model/validator
+    def valid_card_token?(token)
+      begin
+        Stripe::Token.retrieve(token)
+      rescue Stripe::InvalidRequestError => e
+        @subscription.errors[:card_token] << e.message
+        false
+      end
+    end
+end
diff --git a/app/controllers/api/rentals_controller.rb b/app/controllers/api/rentals_controller.rb
index e4b470c5..6c921b2b 100644
--- a/app/controllers/api/rentals_controller.rb
+++ b/app/controllers/api/rentals_controller.rb
@@ -2,7 +2,7 @@ class API::RentalsController < API::ApiController
   before_action :authenticate_user!, except: [:index]
 
   def index
-    @rentals = Rental.includes(:plan_file)
+    @rentals = Rental.all
     @rentals = @rentals.where(group_id: params[:group_id]) if params[:group_id]
     render :index
   end
@@ -69,7 +69,7 @@ def update
     if @rental.update(rental_params)
       render :show, status: :ok
     else
-      render json: @rental.errors, status: :unprocessable_entity
+      render json: @rental.errors, status: :unprocessablse_entity
     end
   end
 
@@ -92,7 +92,7 @@ def rental_params
         end if @parameters[:rental][:prices_attributes]
 
         @parameters = @parameters.require(:rental).permit(:base_name, :type, :group_id, :amount, :interval, :interval_count, :is_rolling,
-            :training_credit_nb, :ui_weight, :disabled,
+            :training_credit_nb, :ui_weight, :disabled, :space_id,
             rental_file_attributes: [:id, :attachment, :_destroy],
             prices_attributes: [:id, :amount]
         )
diff --git a/app/models/rental.rb b/app/models/rental.rb
index 0f455d0e..a0e4c13e 100644
--- a/app/models/rental.rb
+++ b/app/models/rental.rb
@@ -1,24 +1,13 @@
 class Rental < ActiveRecord::Base
   belongs_to :group
 
-  has_many :credits, dependent: :destroy
-  #has_many :training_credits, -> {where(creditable_type: 'Training')}, class_name: 'Credit'
-  #has_many :machine_credits, -> {where(creditable_type: 'Machine')}, class_name: 'Credit'
-  #has_many :space_credits, -> {where(creditable_type: 'Space')}, class_name: 'Credit'
   has_many :rental_subscriptions
-  #has_one :plan_image, as: :viewable, dependent: :destroy
-  has_one :plan_file, as: :viewable, dependent: :destroy
-  has_many :prices, dependent: :destroy
 
   extend FriendlyId
   friendly_id :base_name, use: :slugged
 
-  accepts_nested_attributes_for :prices
-  #accepts_nested_attributes_for :plan_file_file, allow_destroy: true, reject_if: :all_blank
-
   after_update :update_stripe_rental, if: :amount_changed?
   after_create :create_stripe_rental, unless: :skip_create_stripe_rental
-  after_create :create_rentals_prices
   after_destroy :delete_stripe_rental
 
   attr_accessor :skip_create_stripe_rental
@@ -79,7 +68,7 @@ def human_readable_name(opts = {})
 
   private
   def create_stripe_rental
-    stripe_rental = Stripe::Plan.create(
+    stripe_rental = Stripe::Rental.create(
       amount: amount,
       interval: interval,
       interval_count: interval_count,
@@ -105,13 +94,13 @@ def create_statistic_association(stat_type, stat_subtype)
   end
 
   def update_stripe_rental
-    old_stripe_rental = Stripe::Plan.retrieve(stp_rental_id)
+    old_stripe_rental = Stripe::Rental.retrieve(stp_rental_id)
     old_stripe_rental.delete
     create_stripe_rental
   end
 
   def delete_stripe_rental
-    Stripe::Plan.retrieve(stp_rental_id).delete
+    Stripe::Rental.retrieve(stp_rental_id).delete
   end
 
 
diff --git a/app/models/rental_subscription.rb b/app/models/rental_subscription.rb
index da0e249d..e295e889 100644
--- a/app/models/rental_subscription.rb
+++ b/app/models/rental_subscription.rb
@@ -40,7 +40,7 @@ def save_with_payment(invoice = true, coupon_code = nil)
         unless coupon_code.nil?
           @coupon = Coupon.find_by(code: coupon_code)
           if not @coupon.nil? and @coupon.status(user.id) == 'active'
-            total = plan.amount
+            total = rental.amount
 
             discount = 0
             if @coupon.type == 'percent_off'
@@ -76,12 +76,12 @@ def save_with_payment(invoice = true, coupon_code = nil)
           end
         end
 
-        new_subscription = customer.subscriptions.create(plan: plan.stp_plan_id, source: card_token)
+        new_subscription = customer.subscriptions.create(plan: rental.stp_rental_id, source: card_token)
         # very important to set expired_at to nil that can allow method is_new? to return true
         # for send the notification
         # TODO: Refactoring
         update_column(:expired_at, nil) unless new_record?
-        self.stp_subscription_id = new_subscription.id
+        self.stp_rental_subscription_id = new_subscription.id
         self.canceled_at = nil
         self.expired_at = Time.at(new_subscription.current_period_end)
         save!
@@ -151,7 +151,7 @@ def save_with_local_payment(invoice = true, coupon_code = nil)
       # for send the notification
       # TODO: Refactoring
       update_column(:expired_at, nil) unless new_record?
-      self.stp_subscription_id = nil
+      self.stp_rental_subscription_id = nil
       self.canceled_at = nil
       set_expired_at
       if save
@@ -182,19 +182,19 @@ def save_with_local_payment(invoice = true, coupon_code = nil)
 
   def generate_invoice(stp_invoice_id = nil, coupon_code = nil)
     coupon_id = nil
-    total = plan.amount
+    total = rental.amount
 
     unless coupon_code.nil?
       @coupon = Coupon.find_by(code: coupon_code)
 
       unless @coupon.nil?
-        total = CouponService.new.apply(plan.amount, @coupon, user.id)
+        total = CouponService.new.apply(rental.amount, @coupon, user.id)
         coupon_id = @coupon.id
       end
     end
 
     invoice = Invoice.new(invoiced_id: id, invoiced_type: 'RentalSubscription', user: user, total: total, stp_invoice_id: stp_invoice_id, coupon_id: coupon_id)
-    invoice.invoice_items.push InvoiceItem.new(amount: plan.amount, stp_invoice_item_id: stp_subscription_id, description: plan.name, subscription_id: self.id)
+    invoice.invoice_items.push InvoiceItem.new(amount: rental.amount, stp_invoice_item_id: stp_rental_subscription_id, description: rental.name, subscription_id: self.id)
     invoice
   end
 
@@ -205,7 +205,7 @@ def generate_and_save_invoice(stp_invoice_id = nil)
   def generate_and_save_offer_day_invoice(offer_day_start_at)
     od = offer_days.create(start_at: offer_day_start_at, end_at: expired_at)
     invoice = Invoice.new(invoiced_id: od.id, invoiced_type: 'OfferDay', user: user, total: 0)
-    invoice.invoice_items.push InvoiceItem.new(amount: 0, description: plan.name, subscription_id: self.id)
+    invoice.invoice_items.push InvoiceItem.new(amount: 0, description: rental.name, subscription_id: self.id)
     invoice.save
   end
 
@@ -216,20 +216,20 @@ def generate_and_save_invoice(stp_invoice_id = nil)
   def generate_and_save_offer_day_invoice(offer_day_start_at)
     od = offer_days.create(start_at: offer_day_start_at, end_at: expired_at)
     invoice = Invoice.new(invoiced_id: od.id, invoiced_type: 'OfferDay', user: user, total: 0)
-    invoice.invoice_items.push InvoiceItem.new(amount: 0, description: plan.name, subscription_id: self.id)
+    invoice.invoice_items.push InvoiceItem.new(amount: 0, description: rental.name, subscription_id: self.id)
     invoice.save
   end
 
  def cancel
-    if stp_subscription_id.present?
-      stp_subscription = stripe_subscription
-      stp_subscription.delete(at_period_end: true)
+    if stp_rental_subscription_id.present?
+      stp_rental_subscription = stripe_subscription
+      stp_rental_subscription.delete(at_period_end: true)
       update_columns(canceled_at: Time.now)
     end
   end
 
   def stripe_subscription
-    user.stripe_customer.subscriptions.retrieve(stp_subscription_id) if stp_subscription_id.present?
+    user.stripe_customer.subscriptions.retrieve(stp_rental_subscription_id) if stp_rental_subscription_id.present?
   end
 
   def expire(time)
diff --git a/app/models/space.rb b/app/models/space.rb
index b4f7f204..b3b14de8 100644
--- a/app/models/space.rb
+++ b/app/models/space.rb
@@ -44,7 +44,12 @@ def remove_statistic_subtype
 
   def create_space_prices
     Group.all.each do |group|
-      Price.create(priceable: self, group: group, amount: 0)
+      rental = nil
+      if self.is_rental
+        rental = Rental.new(name: self.name, amount: 0, interval: "month", group_id: group.id, base_name: self.name.to_s, space_id: self.id)
+        rental.save        
+      end
+      Price.create(priceable: self, group: group, amount: 0, plan_id: rental)
     end
 
     Plan.all.includes(:group).each do |plan|
diff --git a/app/views/api/rental_subscriptions/_subscription.json.jbuilder b/app/views/api/rental_subscriptions/_subscription.json.jbuilder
new file mode 100644
index 00000000..f2311a81
--- /dev/null
+++ b/app/views/api/rental_subscriptions/_subscription.json.jbuilder
@@ -0,0 +1,7 @@
+json.extract! subscription, :id, :plan_id
+json.expired_at subscription.expired_at.iso8601
+json.canceled_at subscription.canceled_at.iso8601 if subscription.canceled_at
+json.stripe subscription.stp_subscription_id.present?
+json.plan do
+  json.partial! 'api/shared/plan', plan: subscription.plan
+end
diff --git a/app/views/api/rental_subscriptions/show.json.jbuilder b/app/views/api/rental_subscriptions/show.json.jbuilder
new file mode 100644
index 00000000..4a12922f
--- /dev/null
+++ b/app/views/api/rental_subscriptions/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/rental_subscriptions/subscription', subscription: @subscription
\ No newline at end of file
diff --git a/app/views/api/rentals/index.json.jbuilder b/app/views/api/rentals/index.json.jbuilder
index 488c0c58..86f8a30d 100644
--- a/app/views/api/rentals/index.json.jbuilder
+++ b/app/views/api/rentals/index.json.jbuilder
@@ -1,5 +1,5 @@
 json.array!(@rentals) do |rental|
-  json.extract! rental, :id, :base_name, :name, :interval, :interval_count, :group_id, :training_credit_nb, :description, :type, :ui_weight, :disabled
+  json.extract! rental, :id, :base_name, :name, :interval, :interval_count, :group_id, :training_credit_nb, :description, :type, :ui_weight, :disabled, :space_id
   json.amount (rental.amount / 100.00)
   #json.plan_file_url rental.plan_file.attachment_url if plan.rental_file
 end
diff --git a/app/views/api/rentals/shallow_index.json.jbuilder b/app/views/api/rentals/shallow_index.json.jbuilder
index 0aa22375..f30c3288 100644
--- a/app/views/api/rentals/shallow_index.json.jbuilder
+++ b/app/views/api/rentals/shallow_index.json.jbuilder
@@ -1,6 +1,6 @@
 json.array!(@rentals) do |rental|
   json.id rental.id
-  json.ui_weight rental.ui_weight
+  #json.ui_weight rental.ui_weight
   json.group_id rental.group_id
   json.base_name rental.base_name
   json.amount rental.amount / 100.0
@@ -8,5 +8,5 @@ json.array!(@rentals) do |rental|
   json.interval_count rental.interval_count
   json.type rental.type
   json.disabled rental.disabled
-  json.rental_file_url rental.rental_file.attachment_url if rental.rental_file
+  #json.rental_file_url rental.rental_file.attachment_url if rental.rental_file
 end
diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml
index f59617ff..d64237c4 100644
--- a/config/locales/app.public.en.yml
+++ b/config/locales/app.public.en.yml
@@ -310,7 +310,7 @@ en:
           characteristics: "Characteristics"
           files_to_download: "Files to download"
           projects_using_the_space: "Projects using the space"
-
+          
       rentals_list:
         # list of rentals
         rentals_list:
diff --git a/config/routes.rb b/config/routes.rb
index 0e90d8cc..b081d8b8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -102,7 +102,10 @@
     end
 
     resources :groups, only: [:index, :create, :update, :destroy]
-    resources :subscriptions, only: [:show, :create, :update] do
+    resources :subscriptions, only: [:index, :show, :create, :update] do
+      put ':id/cancel', action: 'cancel', on: :collection
+    end
+    resources :rental_subscriptions, only: [:show, :create, :update] do
       put ':id/cancel', action: 'cancel', on: :collection
     end
     resources :plans, only: [:index, :create, :update, :destroy, :show]
diff --git a/db/migrate/20190613061243_add_space_to_rental.rb b/db/migrate/20190613061243_add_space_to_rental.rb
new file mode 100644
index 00000000..5a5a61c2
--- /dev/null
+++ b/db/migrate/20190613061243_add_space_to_rental.rb
@@ -0,0 +1,5 @@
+class AddSpaceToRental < ActiveRecord::Migration
+  def change
+    add_reference :rentals, :space, index: true, foreign_key: true
+  end
+end