Keep alive enhancements