Feature/updates