Refactored asset specs