Check in/out enhancements