Slightly refactored assets/options handling