Added Returning date in models, removed expiry date and changed compulsory validations in controller