Refactor to allow for asset type