Added refresh support