Feature/refresh