Improvements in following functionality