Feature/allow refresh