Add refresh support plus bug fixes