Replace local variable to Query
Move renttal things to Rental