Adding some validations and renaming close_date do consolidated_at