Improve checkin system