Refactor update feature

Refactoring of last additions concerning update feature and options handling.